# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/06/15 11:19:55-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/ia64-extras
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# include/linux/pci_ids.h
#   2004/06/15 11:19:54-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/pci/pci.ids
#   2004/06/15 11:19:54-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.c
#   2004/06/15 11:19:54-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/06/15 11:19:53-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2004/06/15 11:18:31-06:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/linux-2.4
#   into hp.com:/home/helgaas/linux/ia64-extras
# 
# include/linux/pci_ids.h
#   2004/06/15 11:18:30-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/pci/pci.ids
#   2004/06/15 11:18:30-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.c
#   2004/06/15 11:18:29-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2004/06/15 11:18:29-06:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
#